@charset "utf-8";


/********* general Layout **********/

* {margin:0;padding:0;}
<<<<<<< .mine
#wrapper{width:900px;margin:0 auto;background:#FFF;min-height:600px;}
body {font: 13px verdana, arial, sans-serif;color: #000;line-height:1.5;cursor: default;background: #ccc;}
#left{width:200px;float:left;padding:5px; }
#middle{width:460px;float:left;border-right:solid 2px #ccc;border-left:solid 2px #ccc;padding:10px;}
#right{width:170px;float:left;padding:5px;}
=======
#wrapper{width:900px;margin:0 auto;background:#FFF; height:600px;}
body {font: 12px verdana, arial, sans-serif;color: #000;line-height: 1;cursor: default;background: #ccc;}
#left{width:200px;float:left;height:500px;}
#right{width:400px; border-left:solid 2px #ccc;height:500px;}
>>>>>>> .r9

<<<<<<< .mine
#top{height:20px;margin:20px 0 5px;}
=======
#header{height:30px;margin-bottom:5px;}
>>>>>>> .r9
#navi{font-size:120%; border-bottom:solid 2px #ccc;  }
#footer{height:20px; border-top:solid 2px #ccc;}
.clear{clear:both}

a {text-decoration: none;}
a:hover {text-decoration: underline;}


/*************index.jsp****************/

#center{width:250px;margin:50px auto;background-color:#FFF;}
#login{padding:50px; border: 3px solid #333;}
table{border-collapse:collapse;}
table,th, td{border: 1px solid black;}
table tr{height:20px;}
table td{padding:5px;}
table tr input{width:110px;}
#sortby{margin:10px;}

/************ end index.jsp*************/
<<<<<<< .mine


=======


/*********register ********/
#register {width:500px; margin:30px auto; background-color:white; padding:10px;}
form span{font-style:italic;}
#register form input{margin-top:5px;}
#register form label{font-weight:bold;}

#error{color:red;}
>>>>>>> .r9
.tdOne 
{
	border-right:none; 
	border-bottom:none; 
	border-top:none;
}

.tdTwo 
{
	border-left:none; 
	border-bottom:none; 
	border-top:none;
}

.leftLogo
{
	font-size:20px;
	background-color:#f0a64e;
	border-bottom-style:none; 
	color:#7c2f97;
	text-align:right;
	width: 100px;
}

.rightLogo
{
	font-size:20px;
	background-color:#7c2f97;
	border-bottom-style:none; 
	color:#f0a64e;
	padding-left: 0px;
	text-align:left;
	width: 100px; 
}

.error
{
	text-align:center;
	color:#FF0000;
	font-size:large;
	font-weight:bold;
	font-style:italic;
}